Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 26 Dec 2011 18:15:18 +0000 (10:15 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 26 Dec 2011 18:15:18 +0000 (10:15 -0800)

Trivial merge